merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Fri, 15 Jun 2007 19:33:11 +0000 (13:33 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Fri, 15 Jun 2007 19:33:11 +0000 (13:33 -0600)

Trivial merge